Add comments, as per review