r.1, corrections to 15, 19, & 20 per Matt