fixed all kinda shit