another merge to reconcile gameinfo methods and database methods