Updating for new Ferro release.  Other small content changes.