Improve pretty printing
Fix underscore type parameter problem in Proof
Merge branch 'feature/Pre-GSoC-Improvements' into develop