tweaks +cleanup