Feature/typo corrections