doc update AND various source code updates