Added Stuff

Added 'Undo' functionality.
Added 'delete' statements to reduce memory leaks (not yet 100% coverage
(!) )

Bug fixes.