Fixes of some pizza night

Now without the commit history rewritten because some guy forgot he had configured his girlfriend's github account into git. For a whole month...