Lots of changes, include pyteomics derived code.