fixed some shait