Typo fixes + flow changes