multiple small design tweaks