Waedc qtc

Here comes some cleanup Ervin. Please check if correct and pull in if ok.

Please do not wonder. I just added some more minor changes.