Merge pull request #50 from Dokko1230/master

integration changes to the editor
adds more bugs