Added dwb, updated a few