Fix fixes und refactoring

Markus has left some issues which should be history now.
I also fixed style, again ;)
Fixed some typos
Found some strange extensions i would prefer to ged rid of them...