fixed some thingies