Parsing and display improvements, and add some test-cases

Hi Fred,

could you pull these changes into your repository please?

Thanks,
Niels