Piles of changes to (almost) get the cookbook running.