Various intuitive tweaks