bugfixes & editor enhancements