Merge "core: minor tweaks to description and api."