Fix several bugs
Basic content provider is working