Revised presentation
Minor tweaks