Fixed typos and minor inconsistencies