Added more end game finalization