Filled in some details with feedback.

@nubs I think we are ready to publish what we have here.