Cleaned up some bugs, have matching color box change based on score