misc tweaks and cleaning