More typo-fixes. Should add test right about now