Fixed some bugs in fulfilment