End stats screen, minor bugfixes and graphical tweaks
Merge remote-tracking branch 'origin/master'