Merge formal proof changes from Åsa
Merge formalisation and report structure from Åsa
Fix compiler error