Flushing my backlog (in case Natrak wants to make more changes):

 - tidied up some of the code
 - fixed a small problems