few improvements to the scripts and newer puppet version