state fixes
WIP