more monitor work, fix up some failing tests