Fix a few typos and bugs...hopefully.