combined lines, updated TODO, sorted game reset.