added tracing, commented out exc-handler