Moving and adding helper constants
Minor tweaks
Correctly adding/removing from storage using content resolver