Added editor, and some small fixes
Merge pull request #7 from horselove/editor

Added editor, and some small fixes