Cleaned up a tonne of bugs :)