Updates to importer

Squashed some bugs, made code a little bit more readable etc.
Updated README