minor tweaks to organizers