Finished chapter16 & chapter17

Finished chapter16 & chapter17