Bug Fixes.  Const correctness.  Removing dupes.