Reduce CPU consumption (also allows exiting with ctrl-c now) and clean up previous debugging commit,