Documentation fixes and some clarifications