Fix some typos and copy/paste bugs