Slight changes for easy of understanding/debugging, also squelches some unused variable warnings
Merge pull request #148 from dwimsey/feature/warningfix-unused-variables

Slight changes for easy of understanding/debugging using unused variables