Added optional defaults to InfoDB
Switched InfoDB import loop so it always gets all fields
Minor formatting