+ Added and upgraded graphics
~ Changed match handling to prepare for enhancements
~ small refactoring
Switched two lines in the previous commit, switched them back.