Fixed everything almost

Still have to get scores to update and the charts to display the correct data.