Some changes.  Preparing to merge with the dev branch.