Misc cleanup to bring the cookbook inline with others

Check the individual commits.  There's a bunch of misc stuff