Fr correction

Rework of [previous pull request](https://github.com/alessandro1997/the-codeless-code/pull/80/) + case 35 and 36.

I'll work on the correction again next week