More work on final pres
Minor fixes