Made a few more tweaks to the content provider.