Integrated some review comments. Ready for external review.