more tweaks and changes based on feedback