Upgrades to pyPEG2