Corrected a couple of bugs and did some more work to the ERF importer.