Tidied some things up, fixed some bugs