Rushed the last commit and caused the build not to compile, it should now, and there are some new improvements to the code (I think they are).