added test
improved editor
merged
minor improvements