[WIP] Fixed parts of the cookbook according to comments