Some final changes and cleanup before sending to Matt.