Minor updates. WaitForEmpty doesnt help in console (or Im using it
wrong).