Fixed typos and minor inconsistencies

Fixed some minor typos and inconsistencies