Latest update typos, after refactoring