fixed main game issues, only extra features left