Fixed a couple of typos, unused code, and comments.