grab-bag of cleanupsies