Incremental update to docs and better handlers for return states