fix some glitches & more