etag support & minor improvements