template tweaks
wait for object upload
better logging and contentid naming
Add datastore
whoops
capitalization
strings