fixing some thingssssss