more minor design tweaks