more improvements to 'dot -P'