fixed some stuiff