Fixed a few problems with the initial import.