Fixed state saving; added hints.
Merge branch 'master' of https://github.com/kisonecat/ximera