Bunch of bug fixes
screenshots