fixed some notices and a couple bad variable names
Merge pull request #13 from zbtirrell/notice-fix

fixed some notices and a couple bad variable names