Possible Issues solved

Game ending logic left