fix some stuff9