Some last improvements for "Additional information". See #161