Fun factor! (PM fix and more functionality)