Fixed some bugs
Merge branch 'editor' of https://github.com/edvorg/drash into editor