fixed some stuff kinda not really