Minor tweaks + parallelized.