Fixed some typos, inconsistencies