better visual feedback, more tweaks