Small fixes and diagnostic additions

While profiling concurrency, CPU consumption drops to 1/3 and everything
runs smoothly