fixed spacing issues
Moving changes from toms branch in by hand.
Merge branch 'master' into tom