some tweaks in pretty-printer