Incorporated detailed review comments from Steven Kent.