Fixes for ordering, unused vars, and spelling
Merge pull request #170 from asmaloney/misc_fixes

Fixes for ordering, unused vars, and spelling