putting away some minor changes before going back to master