docs update
even more named arguments
merged diverged branches