Address most review comments.