* improvements of the pretty printer