diff --git a/schema.graphql b/schema.graphql
index 98a35e6..1de9135 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -258,11 +258,11 @@ type Order @entity {
   # the fees will be updated from an event that will be created after (todo)
   publishingMarket: User
   publishingMarketToken: Token                                #
-  publishingMarketAmmount: BigDecimal                         #call contract to get fee ammount
+  publishingMarketAmmount: BigDecimal                         #call contract to get fee amount
 
   consumerMarket: User
   consumerMarketToken: Token                                  #
-  consumerMarketAmmount: BigDecimal                           #call contract to get fee ammount
+  consumerMarketAmmount: BigDecimal                           #call contract to get fee amount
 
   createdTimestamp: Int!
   tx: String!
@@ -299,6 +299,10 @@ type FixedRateExchange @entity {
   owner: User!
   datatoken: Token!
   baseToken: Token!
+  "amount of datatokens available to be sold, this is relevant if the exchange is not able to mint"
+  datatokenBalance: BigDecimal!
+  "amount of basetokens available to be collected by the owner"
+  baseTokenBalance: BigDecimal!
   price: BigDecimal!
   active: Boolean!
   "amount of total basetokens spent"
diff --git a/src/mappings/pool.ts b/src/mappings/pool.ts
index b7a4094..3a0ef6d 100644
--- a/src/mappings/pool.ts
+++ b/src/mappings/pool.ts
@@ -1,4 +1,3 @@
-import { log } from '@graphprotocol/graph-ts'
 import {
   LOG_EXIT,
   LOG_JOIN,
diff --git a/subgraph.rinkeby.yaml b/subgraph.rinkeby.yaml
index 70e772b..63b1e27 100644
--- a/subgraph.rinkeby.yaml
+++ b/subgraph.rinkeby.yaml
@@ -8,7 +8,7 @@ dataSources:
     name: ERC721Factory
     network: rinkeby
     source:
-      address: '0x65aCFbcf0576D5740d1a824afd1776E7D4034C3D'
+      address: '0xD9b5488363463E3689C1430030F5A17b427718E1'
       abi: ERC721Factory
       startBlock: 10065057
     mapping:
@@ -30,7 +30,7 @@ dataSources:
     name: FixedRateExchange
     network: rinkeby
     source:
-      address: '0x40F63Ec24aDc291d41F63fBA356Dd9983197c83a'
+      address: '0xdf29DA8FF979170eBfEd7133068dA247dc04CdC9'
       abi: FixedRateExchange
       startBlock: 10065057
     mapping:
@@ -64,7 +64,7 @@ dataSources:
     name: Dispenser
     network: rinkeby
     source:
-      address: '0x5b18fbac5aA81B4a0CAF993afb69b2ADfC3E8833'
+      address: '0x5FfDe8179E095803de22CBe1D405Eeef18406852'
       abi: Dispenser
       startBlock: 10065057
     mapping:
@@ -95,7 +95,7 @@ dataSources:
     name: FactoryRouter
     network: rinkeby
     source:
-      address: '0x5a31C7e57D51fc0991C1315c66587e7a158c9c40'
+      address: '0x5De02B776106d0dC81d4335f58E29ECaE717e90A'
       abi: FactoryRouter
       startBlock: 10065057
     mapping: