more micro-tweaks