Some mods from E Metral

Still to change figures, and numbers for HL-Lhc parameters and
calculated values
Volker comments added. Trimmed to 3 pages