Lots of little fixes

Getting back at this