kind of fixed some stuff