fixed a few mistyped variables
Merge pull request #137 from Ghostwalker71/fix/merge_breaks

fixed a few mistyped variables