WIP parralell fixes AND some code cleanup, need to factor out
WIP parallel fixes