Lots of small glitches/bug fixes