fixin some stuff