Puppet scripts and configuration improved