fix some stuff11