Do all the 1.7.10 updating that apparently didn't happen... add a few printouts for verbosity and ease of debugging. Move stuff into alphabetical order.