minor design-tweaks