Proof refactors and other misc changes
Merge remote-tracking branch 'origin/develop-nick' into develop-nick