content+extension: tweaks to integration and extension system