Add DWN, other minor updates.

Change-Id: If34c9813a9d5fd1543da0f3f982a4abfaeb5d9cc