Fixed typos, minor comment cleanup