fixed a few mix errors