Fix things until the end

Now let's perhaps go through it again and try to understand something ^^