Some minor spelling things in 1.1, finish 1.6
Some more spelling fixes
Fix merge conflict