finish end game screen, refactor a few things