tweaks based on suggestions