minor tweaks for better usability