Just a small request: Please split unrelated commits, this makes testing for regressions and viewing changes easier.