Some finishing touches to comments