more glitch fixes