A handful of tweaks