Puppet configuration improved and fixes