Tidied a few things

Changed a few bits and bobs.