froofread state sizes and constraints improvement