Fix small mistakes

Sadly there are still a quite a lot of errors left :(