bugfix
Mutiple quality fixes