formatting changes
merged
parallel SOR
merge
make thins work again...