Cleaned some glitches