deferred: documentation update, fixes and improvements.