Fix Types module, and a bit of prettifying output