Fixed some typos, and removed some test code