divide by zero errors
small changes. move to using one datafile rather than a list
fixed conflicts