bugfixing test phase
bugifixing in editing events