Fixes and glitches