- tweaks after testing
 - initial convert to new puppet format