better debug routines, code cleaning

Added a couple more debug groups to break up the amount of info
presented into clearer groups. Cleaned up some old code that was
commented out and no longer in use.