cs fixes

I tried to fix according to psr-2, but lot more stuff to fix, than I expected, the rest comes tomorrow evening! ;-)