some documentation changes
merged confilcts