style & behavior tweaks from review with Felicia