Quick tidy up and implementation of odd things I spoke to Rose about