Addressed review comments.  Rebased.  Got rid of temporary patch for bug fixes.