Running modifications/improvements from Tobi

;) if you want to have them