Looks like I missed a few internal variable names due to pushovers rather confusing nomenclature.  This fixes #16.