Improvements to crash handler, more areas are covered