No more increment/decrement in PM

Fixes #3.
Fixes #4.