Fix logging of results, it works!
Lots of fixes for recovery from crashing