miscellaneous tweaks and clean-up