new part of documentation + small tweeks
new part of documentation + small tweeks (merge conflict fix)