fix some stuff4