Worked on some glitches