tweaks and cleans