big commit -- fixes issues with decryption checker, as well as other
code cleanup across the board