added upsert ability to datastore update, field formatting
removed print statements