updates to docu
merge