Adding pretty printing of real problems and support for bonus