fixed some stuff i messed up