1.1-dev: finally fixed up all of our crummy problems, working on finalising 1.1