Improve content and update configuration