Merge branch 'chris' into Jameson
Fixed syntax errors and a couple logical issues.
Merge branch 'Jameson' into chris