started class 19, minor fixes to 17 and 18