Review on chapters

- Fixed last TODOs
- Changed last picture to black and white