add more stack traces, other minor changes