a bunch of final minor changes
lots of final little fixup changes