Resolved 201-4 and fixed major bug in edit mode