way too large commit to fix a lot of things ;-)