Lots of helpful comments, fixes for ship saving