making progress on comments implementation