Improve … everything?

@LEDfan 

(untested)