fixed some wrong stuff