Some changes

Some changes to client and server. GameState added to handle commands
in different ocasions.