add updated lectures 16 and 17 from master