fix some stuff7