fixed editor class
implemented
minor changes
implemented
implemented
minor changes