doc fixes
pre merge
pre merge