fixed some bugsy