tweaks and clean up