Added possibility to remove self-links for pf computation
Improved plotting