Reorganized order of functions; etag on PUT