Vairous typo fixes/improving consistency