miscelaneous changes to prep for 1.2.0