class 17 stub, minor typo fixes to 15 and 16