more tweaks and clean