more design tweaks for #2