Cleaned up optional usage, moved debug statements to logging
Merge pull request #689 from 7sharp9/optionCleanup

Cleaned up optional usage, moved debug statements to logging