more fixes added a map to handle certain fields from json