commented out puppet stuff, added comments why