diff --git a/doc/doxygen.warnings.report.sh b/doc/doxygen.warnings.report.sh
index 25cbcf753..1d59a2902 100755
--- a/doc/doxygen.warnings.report.sh
+++ b/doc/doxygen.warnings.report.sh
@@ -2,63 +2,132 @@
 
 # Process doxygen.warnings.log to generate sorted list of top offenders
 
+# Flag to skip running doxygen
+skipdoxy=${1:-""}
+
 DIR=`dirname $0`
 ROOT=`hg root`
+# Final resting place for the log file
+log=$DIR/doxygen.warnings.log
+
 
 # First, we have to modify doxygen.conf to generate all the warnings
 # (We also suppress dot graphs, so shorten the run time.)
 
-conf=$DIR/doxygen.conf
+if [ "$skipdoxy" == "" ]; then
 
-sed -i.bak -E '/^EXTRACT_ALL |^HAVE_DOT |^WARNINGS /s/YES/no/' $conf
-rm -f $conf.bak
+    conf=$DIR/doxygen.conf
 
-echo -n "Rebuilding doxygen docs with full errors..."
-(cd $ROOT && ./waf --doxygen >/dev/null 2>&1)
-status=$?
+    sed -i.bak -E '/^EXTRACT_ALL |^HAVE_DOT |^WARNINGS /s/YES/no/' $conf
+    rm -f $conf.bak
 
-hg revert $conf
+    echo -n "Rebuilding doxygen docs with full errors..."
+    (cd $ROOT && ./waf --doxygen >/dev/null 2>&1)
+    status=$?
+
+    hg revert $conf
+
+    if [ "$status" = "0" ]; then
+	echo "Done."
+    else
+	echo "FAILED."
+	exit 1
+    fi
+
+    mv $DIR/doxygen.log $log
 
-if [ "$status" = "0" ]; then
-    echo "Done."
 else
-    echo "FAILED."
-    exit 1
+    echo "Skipping doxygen run, using existing log file $log"
 fi
 
 
-# Save the log file
-log=$DIR/doxygen.warnings.log
+# Analyze the log
 
-mv $DIR/doxygen.log $log
+# List of module directories (e.g, "src/core/model")
+undocmods=$(                \
+    grep "^$ROOT" "$log"  | \
+    cut -d ':' -f 1       | \
+    sed "s|$ROOT||g"      | \
+    cut -d '/' -f 2-4     | \
+    sort                  | \
+    uniq -c               | \
+    sort -nr                \
+    )
+    
+
+# Number of directories
+modcount=$(                         \
+    echo "$undocmods"             | \
+    wc -l                         | \
+    sed 's/^[ \t]*//;s/[ \t]*$//'   \
+    )
+
+# For a function with multiple undocumented parameters,
+# Doxygen prints the additional parameters on separate lines,
+# so they don't show up in the totals above.
+# Rather than work too hard to get the exact number,
+# we just list the total here. 
+addlparam=$(                                  \
+    grep -v "^$ROOT" $log                   | \
+    grep -v "not generated, too many nodes" | \
+    grep "^  parameter '" $log              | \
+    wc -l                                   | \
+    sed 's/^[ \t]*//;s/[ \t]*$//'             \
+    )
+
+# Total number of warnings
+warncount=$(echo "$undocmods" | \
+    awk '{total += $1}; END {print total}' )
+warncount=$((warncount + addlparam))
+
+# List of files appearing in the log
+undocfiles=$( \
+    grep "^$ROOT" "$log"  | \
+    cut -d ':' -f 1       | \
+    sed "s|$ROOT||g"      | \
+    cut -d '/' -f 2-      | \
+    sort                  | \
+    uniq -c               | \
+    sort -k 2               \
+    )
+
+# Total number of files
+filecount=$(                        \
+    echo "$undocfiles"            | \
+    wc -l                         | \
+    sed 's/^[ \t]*//;s/[ \t]*$//'   \
+    )
 
 # Now we're ready to summarize the log
 
-
 echo
-echo "Summary Report of Doxygen warnings:"
+echo "Report of Doxygen warnings"
+echo "----------------------------------------"
 echo
-echo "Count of warning by module:"
-echo "Count Module"
-grep "^$ROOT" $log  | \
-    cut -d ':' -f 1 | \
-    sed "s|$ROOT||g" | \
-    cut -d '/' -f 1-3 | \
-    sort | \
-    uniq -c | \
-    sort -nr
-
-echo 
-
-undocparam=` \
-grep -v "^$ROOT" $log | \
-    grep -v "not generated, too many nodes" | \
-    grep "^  parameter '" $log | \
-    wc -l | \
-    sed 's/^[ \t]*//;s/[ \t]*$//' `
-
-echo "+ $undocparam additional undocumented parameters."
-echo
-
 echo "(All counts are lower bounds.)"
 echo
+echo "Warnings by module/directory:"
+echo
+echo "Count Directory"
+echo "----- ----------------------------------"
+echo "$undocmods"
+echo " $addlparam additional undocumented parameters."
+echo "----------------------------------------"
+printf "%6d total warnings\n" $warncount
+printf "%6d directories with warnings\n" $modcount
+echo
+echo
+echo "Warnings by file"
+echo
+echo "Count File" 
+echo "----- ----------------------------------"
+echo "$undocfiles"
+echo "----------------------------------------"
+printf "%6d files with warnings\n" $filecount
+echo
+echo
+echo "Doxygen Warnings Summary"
+echo "----------------------------------------"
+printf "%6d directories\n" $modcount
+printf "%6d files\n" $filecount
+printf "%6d warnings\n" $warncount
diff --git a/src/lte/helper/mac-stats-calculator.h b/src/lte/helper/mac-stats-calculator.h
index c4c69d8e8..98c57dbe0 100644
--- a/src/lte/helper/mac-stats-calculator.h
+++ b/src/lte/helper/mac-stats-calculator.h
@@ -31,7 +31,6 @@ namespace ns3 {
 
 /**
  * Takes care of storing the information generated at MAC layer. Metrics saved are:
- *time\tframe\tsframe\tRNTI\tmcsTb1\tsizeTb1\tmcsTb2\tsizeTb2
  *   - Timestamp (in seconds)
  *   - Frame index
  *   - Subframe index
diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc
index 15c27777e..7a04fccf3 100644
--- a/utils/print-introspected-doxygen.cc
+++ b/utils/print-introspected-doxygen.cc
@@ -61,11 +61,18 @@ PrintAttributes (TypeId tid, std::ostream &os)
 	 << "    " << listLineStart << "Set with class: " << reference << info.checker->GetValueTypeName () << listLineStop << std::endl;
       if (info.checker->HasUnderlyingTypeInformation ())
 	{
-	  os << "    " << listLineStart << "Underlying type: " << reference << info.checker->GetUnderlyingTypeInformation () << listLineStop << std::endl;
+	  os << "    " << listLineStart << "Underlying type: ";
+	  if (    (info.checker->GetValueTypeName () != "ns3::EnumValue")
+	       && (info.checker->GetUnderlyingTypeInformation () != "std::string")
+	      )
+	    {
+	      os << reference;
+	    }
+	  os << info.checker->GetUnderlyingTypeInformation () << listLineStop << std::endl;
 	}
       if (info.flags & TypeId::ATTR_CONSTRUCT && info.accessor->HasSetter ())
 	{
-	  os << "    " << listLineStart << "Initial value: " << reference << info.initialValue->SerializeToString (info.checker) << listLineStop << std::endl;
+	  os << "    " << listLineStart << "Initial value: " << info.initialValue->SerializeToString (info.checker) << listLineStop << std::endl;
 	}
       os << "    " << listLineStart << "Flags: ";
       if (info.flags & TypeId::ATTR_CONSTRUCT && info.accessor->HasSetter ())