Addressed a few remaining review comments.