Fix a few more things. about to try removing parallelization