okay fixed some stuff