Fix typos, remove commented out stuff.