More Fixesand remove debugging