Several typo fixes and solution for 1.09.
Rewrite 1.07

- Rewrite 1.07 with blocs approach.