Update GameAP. Fix bugs