fixing small glitches