New spelling and syntax fixes