clarify actions, enums, and simplify hash states