Tweaks on CountDownLatches and shutdown
Debug Statements - do not merge this on master