Closes #23 and fixes a few things that I didn't realise were broken. whi...

...ch is nice