assorted clean-ups