tweaks to setup cookbooks and fixes for roles