Idfix

Started with editing module, two bugfixes