Fixed p/r button.
Clean up.