Fixed #814 - lots of small typos fixed