More work on the event importer and fix some module issues