bug fixes
started work on behavior in editor