Tweaks

More minor tweaks, things are nice and tidy now!