Improve documentation: remove upgrade and merge content to install

Improve documentation: remove upgrade and merge content to install, plus mix of fixes