Fixed glitches and improvements