tweaks and cleaning