docs and tweaks

Change-Id: I36eb1aac6b25a370282b20cd0fd0f748c6390df4