Tweaks everywhere

Again, feel free to take from this whatever you think works best.