Added crash info and basic tidy up