A zillion of improvements inspired by http://steckerhalter.co.vu/steckemacs.html