fixed some stuff sorta