editor fixes
fixes #135
fixes #136