Import cleanup (global defs have now obsolete and no longer needed)
Proper exception handling for explicitly uncaught exceptions and some minor bugfixes/cleanup