More fixes. We have a working update!
There seem to be some errors in the results, need to check these next.