merge reverted and small doc changes