Updating the puppet definition with assorted bug fixes.