CHECKPOINT 3: fixed bugs, modified import script to work with new data