Added a few controls over debugging