Overtime Boost

I got fed up with jumping to shortpix just to get the vacuum cleaner to
run twice as often.
Nerfing
Papal Tweak
Merge pull request #674 from waveney/wav23

Overtime Boost and nerf