Fixed remaining dodgy values, lots of data seems to have changed.