Fixingmaster

More Fixes