Fixed a few bugs and streamlined the import process.