Better etags plus tidy up