branch merge
spelling fixes