More smooth level progression

Functionally, the key 'p' and 'r' do the same thing, just in different
places.  O does level progression, but still has a bug where it does not
increase the difficulty properly.  Still looking into that, its just an
issue of 3 variables between 2 classes not talking correctly.