Commented our parallelization
Fixed various issues