A few changes to modules and Products, offending lines of PeakMap commented at the moment