Added etags
Bugfixes