Order types and states, tweaks