Iteration 1 edit dcn

Iteration 1 edits based on comments from David Noone.