Improved Puppet code for various modules.