fixing lection 16
Fixes for lections 17 and 18