diff --git a/src/exchangedb/exchange-0001.sql b/src/exchangedb/exchange-0001.sql
index 80ad95273..c5f5153a3 100644
--- a/src/exchangedb/exchange-0001.sql
+++ b/src/exchangedb/exchange-0001.sql
@@ -525,6 +525,7 @@ CREATE TABLE IF NOT EXISTS recoup
   ,timestamp INT8 NOT NULL
   ,reserve_out_serial_id INT8 NOT NULL REFERENCES reserves_out (reserve_out_serial_id) ON DELETE CASCADE
   );
+-- FIXME: explain table better!
 COMMENT ON TABLE recoup
   IS 'Information about recoups that were executed';
 COMMENT ON COLUMN recoup.known_coin_id
@@ -552,6 +553,7 @@ CREATE TABLE IF NOT EXISTS recoup_refresh
   ,timestamp INT8 NOT NULL
   ,rrc_serial INT8 NOT NULL UNIQUE REFERENCES refresh_revealed_coins (rrc_serial) ON DELETE CASCADE
   );
+-- FIXME: explain table better!
 COMMENT ON COLUMN recoup_refresh.known_coin_id
   IS 'Do not CASCADE ON DROP on the known_coin_id, as we may keep the coin alive!';
 COMMENT ON COLUMN recoup_refresh.rrc_serial
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 38c4ce1a3..c5cf4110d 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -831,7 +831,8 @@ TALER_EXCHANGE_verify_coin_history (
         return GNUNET_SYSERR;
       }
       *h_denom_pub = rr.h_denom_pub;
-      add = GNUNET_YES;
+      add = GNUNET_YES;  // FIXME: one of these should be a "NO"
+      // => need better tests!!!
     }
     else if (0 == strcasecmp (type,
                               "OLD-COIN-RECOUP"))
@@ -878,7 +879,7 @@ TALER_EXCHANGE_verify_coin_history (
         GNUNET_break_op (0);
         return GNUNET_SYSERR;
       }
-      add = GNUNET_YES;
+      add = GNUNET_YES; // FIXME: one of these should be a "NO"
     }
     else
     {
@@ -911,7 +912,8 @@ TALER_EXCHANGE_verify_coin_history (
          However, for the implementation, we first *add* up all of
          these negative amounts, as we might get refunds before
          deposits from a semi-evil exchange.  Then, at the end, we do
-         the subtraction by calculating "total = total - rtotal" */GNUNET_assert (GNUNET_NO == add);
+         the subtraction by calculating "total = total - rtotal" */
+      GNUNET_assert (GNUNET_NO == add);
       if (0 >
           TALER_amount_add (&rtotal,
                             &rtotal,