new puppet type and easy type fixes