performance fixes
Merge branch 'master' of github.com:brandonforster/crash