tweaks and polish