formatting
faster, simpler locking
better smatrix_benchmark
cleaning up