Fixed various typos and botches from our quick sprint before