Modified code generator, improved PISA pretty-printer