Much bits and bobs

useful I know, but it's only me committing :)