Remove some debuggery and fix importer.  We now have a nicely extendable importer.  That's cool.