More Stuff to do with mobs and some tidying