Walter's fixes from bitbucket
Docs update.