Loads of small little bug and a bit of cleaning up, just a bit