cleaning and some more tweaks