Content provider and content resolver finished and tuned up