fixes to make the editor fully functional
Merge branch 'master' of https://github.com/chrisamaphone/slimycat