I don't really remember what these changes were about, but it seems to run; have to look at parallelism stuff again in the future to get decent performance