Fixed state andtype enums, and summurized