Finish class 17 and fix some typos