Final Tweaks!

This is code freeze, I promise. No more bad behaviour!