Reduce crazy run number
Apply tweaks from @majek