fix some stuff2