Markup fixes
Be clear about state