minor bug fixes and enhancements to PM component