fix puppet problems
setup the right require hierarchy for puppet
clean up