fixed bugs of first time pm review