Reduce Glitches + smootheng

Note vendor is also going to be updated