fix up the save state work
Merge branch 'backbone' of github.com:prose/prose into backbone