I reworked the PM system.  Fixed a lot of nuisances.