Editing improvements & Bugfixes