Change EMs to PXs, minor fixes