refactor state managers
fix
Merge branch 'master' into dev
..
space-as-offset is off by default
todo