Typo fixes. Need to write unit tests