changes to entry error handling: undo support added

also some bugfixes...