fix some bugs. move things back that need to be in main Puppetfile