Ditto and spelling fixes