Fixing typos, bit of style changes, removing reserved words as variables.

....