fixes
Discount Dan's Changes and Fixes!
Fixes
Merge pull request #1172 from Iamgoofball/butt

Discount Dan's Changes and Fixes!