Fix typos and start class 17