Some saved states, docs and minor engine updates