text-block margins, all states, other small fixes