more tweaks from feedback