Processed more comments from Andrew.