Some cleanup, began importing data into database. Progress in database/