Few glitches fixed!