polish and some glitches