Rebased, and fixed up a few niggling issues