moved all end user related code to the editor
cleaned up some code