-*-pa-*- some bugs fixed, better output