Changes based on Honolulu meeting and email list comments