clean some glitches