Tweaks

Tidied up a few bits n pieces