Fill in new data columns, fix a couple of dodgy points