Merge + some typo fixes