--- a/RELEASE_NOTES	Wed Sep 17 18:52:01 2014 -0700
+++ b/RELEASE_NOTES	Fri Sep 19 11:47:30 2014 -0700
@@ -9,12 +9,32 @@
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3-dev
+=============
+
+Availability
+------------
+This release is not yet available.
+
+Supported platforms
+-------------------
+
+New user-visible features
+-------------------------
+
+Bugs fixed
+----------
+
+Known issues
+------------
+
 Release 3.21
 ============
 
 Availability
 ------------
-This release is not yet available.
+This release is available from:
+http://www.nsnam.org/release/ns-allinone-3.21.tar.bz2
 
 Supported platforms
 -------------------

--- a/src/lte/helper/lte-helper.cc	Wed Sep 17 18:52:01 2014 -0700
+++ b/src/lte/helper/lte-helper.cc	Fri Sep 19 11:47:30 2014 -0700
@@ -1002,6 +1002,8 @@
   LogComponentEnable ("PhyTxStatsCalculator", LOG_LEVEL_ALL);
   LogComponentEnable ("PhyRxStatsCalculator", LOG_LEVEL_ALL);
   LogComponentEnable ("PhyStatsCalculator", LOG_LEVEL_ALL);
+  LogComponentEnable ("PssFfMacScheduler", LOG_LEVEL_ALL);
+  LogComponentEnable ("SpectrumModel", LOG_LEVEL_ALL);
 
 
 }

--- a/src/lte/model/lte-enb-phy.cc	Wed Sep 17 18:52:01 2014 -0700
+++ b/src/lte/model/lte-enb-phy.cc	Fri Sep 19 11:47:30 2014 -0700
@@ -644,12 +644,14 @@
               uint32_t mask = 0x1;
               for (int i = 0; i < 32; i++)
                 {
+                  std::cout << std::hex << dci->GetDci ().m_rbBitmap << std::endl;
                   if (((dci->GetDci ().m_rbBitmap & mask) >> i) == 1)
                     {
                       for (int k = 0; k < GetRbgSize (); k++)
                         {
                           m_dlDataRbMap.push_back ((i * GetRbgSize ()) + k);
-                          //NS_LOG_DEBUG(this << " [enb]DL-DCI allocated PRB " << (i*GetRbgSize()) + k);
+                          NS_LOG_DEBUG(this << " [enb]DL-DCI allocated PRB " << (i*GetRbgSize()) + k);
+                          NS_LOG_DEBUG("YY i " << i << " RbgSize " << (uint16_t) GetRbgSize() << " k " << k);
                           GeneratePowerAllocationMap (dci->GetDci ().m_rnti, (i * GetRbgSize ()) + k );
                         }
                     }

--- a/src/lte/model/lte-spectrum-value-helper.cc	Wed Sep 17 18:52:01 2014 -0700
+++ b/src/lte/model/lte-spectrum-value-helper.cc	Fri Sep 19 11:47:30 2014 -0700
@@ -224,7 +224,11 @@
           rb.fh = f;
           rbs.push_back (rb);
         }
+      NS_LOG_DEBUG ("XX txBandwidth " << (int16_t) txBandwidthConfiguration << " f " << f);
+      std::cout.precision(15);
+      std::cout << "XX f " << std::fixed << f << std::endl;
       ret = Create<SpectrumModel> (rbs);
+      NS_LOG_DEBUG ("XX numBands " << ret->GetNumBands ());
       g_lteSpectrumModelMap.insert (std::pair<LteSpectrumModelId, Ptr<SpectrumModel> > (key, ret));
     }
   NS_LOG_LOGIC ("returning SpectrumModel::GetUid () == " << ret->GetUid ());

--- a/src/lte/model/pss-ff-mac-scheduler.cc	Wed Sep 17 18:52:01 2014 -0700
+++ b/src/lte/model/pss-ff-mac-scheduler.cc	Fri Sep 19 11:47:30 2014 -0700
@@ -985,6 +985,7 @@
                       rbgMask = rbgMask + (0x1 << dciRbg.at (k));
                       rbgAllocatedNum++;
                     }
+	          std::cout << "ZZ " << std::hex << dci.m_rbBitmap << ":" << std::hex<< rbgMask << std::endl;
                   dci.m_rbBitmap = rbgMask;
                   rbgMap = rbgMapCopy;
                   NS_LOG_INFO (this << " Move retx in RBGs " << dciRbg.size ());

--- a/src/lte/test/lte-test-frequency-reuse.cc	Wed Sep 17 18:52:01 2014 -0700
+++ b/src/lte/test/lte-test-frequency-reuse.cc	Fri Sep 19 11:47:30 2014 -0700
@@ -35,6 +35,7 @@
 #include "ns3/internet-module.h"
 #include "ns3/point-to-point-module.h"
 #include "ns3/applications-module.h"
+#include "ns3/config-store-module.h"
 
 #include <ns3/ff-mac-scheduler.h>
 #include <ns3/lte-enb-net-device.h>
@@ -65,9 +66,9 @@
 {
 //  LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_DEBUG);
 //  LogComponentEnable ("LteFrequencyReuseTest", logLevel);
-
   std::vector<bool> availableDlRb;
   std::vector<bool> availableUlRb;
+#if 0
   for (uint32_t i = 0; i < 12; i++)
     {
       availableDlRb.push_back (true);
@@ -92,6 +93,7 @@
 
   availableDlRb.clear ();
   availableUlRb.clear ();
+#endif
   for (uint32_t i = 0; i < 6; i++)
     {
       availableDlRb.push_back (true);
@@ -112,7 +114,7 @@
       availableDlRb.push_back (false);
       availableUlRb.push_back (false);
     }
-
+#if 0
   AddTestCase (new LteStrictFrTestCase ("DownlinkStrictFrPf1", 1, "ns3::PfFfMacScheduler", 25, 25, 6, 6, 6, 6, 6, 6, availableDlRb, availableUlRb), TestCase::QUICK);
   AddTestCase (new LteStrictFrTestCase ("DownlinkStrictFrPf2", 5, "ns3::PfFfMacScheduler", 25, 25, 6, 6, 6, 6, 6, 6, availableDlRb, availableUlRb), TestCase::QUICK);
   AddTestCase (new LteStrictFrTestCase ("DownlinkStrictFrPss1", 1, "ns3::PssFfMacScheduler", 25, 25, 6, 6, 6, 6, 6, 6, availableDlRb, availableUlRb), TestCase::QUICK);
@@ -131,7 +133,9 @@
   AddTestCase (new LteStrictFrAreaTestCase ("LteStrictFrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), TestCase::QUICK);
 
   AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCasePf1", "ns3::PfFfMacScheduler"), TestCase::QUICK);
+#endif
   AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCasePss1", "ns3::PssFfMacScheduler"), TestCase::QUICK);
+#if 0
   AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), TestCase::QUICK);
   AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), TestCase::QUICK);
   AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), TestCase::QUICK);
@@ -153,6 +157,7 @@
   AddTestCase (new LteDistributedFfrAreaTestCase ("LteDistributedFfrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), TestCase::QUICK);
   AddTestCase (new LteDistributedFfrAreaTestCase ("LteDistributedFfrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), TestCase::QUICK);
   AddTestCase (new LteDistributedFfrAreaTestCase ("LteDistributedFfrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), TestCase::QUICK);
+#endif
 }
 
 static LteFrequencyReuseTestSuite lteFrequencyReuseTestSuite;
@@ -804,8 +809,10 @@
   Config::SetDefault ("ns3::LteUePowerControl::AccumulationEnabled", BooleanValue (false));
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  lteHelper->EnableLogComponents ();
 
   // Create Nodes: eNodeB and UE
+  int64_t stream = 1;
   NodeContainer enbNodes;
   NodeContainer ueNodes1;
   NodeContainer ueNodes2;
@@ -863,9 +870,12 @@
 
   lteHelper->SetFfrAlgorithmType ("ns3::LteFrNoOpAlgorithm");
   enbDevs.Add (lteHelper->InstallEnbDevice (enbNodes.Get (1)));
+  stream += lteHelper->AssignStreams (enbDevs, stream);
 
   ueDevs1 = lteHelper->InstallUeDevice (ueNodes1);
+  stream += lteHelper->AssignStreams (ueDevs1, stream);
   ueDevs2 = lteHelper->InstallUeDevice (ueNodes2);
+  stream += lteHelper->AssignStreams (ueDevs2, stream);
 
   // Attach a UE to a eNB
   lteHelper->Attach (ueDevs1, enbDevs.Get (0));
@@ -944,14 +954,19 @@
   Simulator::Schedule (MilliSeconds (1001),
                        &LteFrAreaTestCase::SetUlExpectedValues, this, 0.0150543, expectedUlRbCenterArea );
 
+  Config::SetDefault ("ns3::ConfigStore::Filename", StringValue ("output-attributes.txt"));
+  Config::SetDefault ("ns3::ConfigStore::FileFormat", StringValue ("RawText"));
+  Config::SetDefault ("ns3::ConfigStore::Mode", StringValue ("Save"));
+  ConfigStore outputConfig2;
+  outputConfig2.ConfigureDefaults ();
+  outputConfig2.ConfigureAttributes ();
+
   Simulator::Stop (Seconds (1.500));
   Simulator::Run ();
 
-#if 0
   NS_TEST_ASSERT_MSG_EQ (m_usedWrongDlRbg, false,
                          "Scheduler used DL RBG muted by FFR Algorithm");
 
-#endif
   NS_TEST_ASSERT_MSG_EQ (m_usedWrongUlRbg, false,
                          "Scheduler used UL RB muted by FFR Algorithm");
 
@@ -1705,10 +1720,8 @@
   Simulator::Stop (Seconds (2.500));
   Simulator::Run ();
 
-#if 0
   NS_TEST_ASSERT_MSG_EQ (m_usedWrongDlRbg, false,
                          "Scheduler used DL RBG muted by FFR Algorithm");
-#endif
 
   NS_TEST_ASSERT_MSG_EQ (m_usedWrongUlRbg, false,
                          "Scheduler used UL RB muted by FFR Algorithm");

--- a/src/spectrum/model/spectrum-model.cc	Wed Sep 17 18:52:01 2014 -0700
+++ b/src/spectrum/model/spectrum-model.cc	Fri Sep 19 11:47:30 2014 -0700
@@ -45,6 +45,7 @@
 {
   NS_ASSERT (centerFreqs.size () > 1);
   m_uid = ++m_uidCount;
+  NS_LOG_INFO ("creating new SpectrumModel, m_uid=" << m_uid);
 
   for (std::vector<double>::const_iterator it = centerFreqs.begin ();
        it != centerFreqs.end ();