Update error logic process for failed push op

Finish condense todo item, clean up some documentation on core data
store, and extra test cases