Bug fixes for creation of charged PFO
In the production mode this includes a bug fix such that we set links to all clusters that are matched and have energy removed, rather than only the last in the list. Secondly it has a bug fix for e/p mode to ensure links are set to all matched clusters.