Additional fixes suggested by recent issues. closes #637
closes #619 & #626
Ward and Jeremy Todo: EXCLUDE Old router doc for reference while re-writing