ENH: better tags/etc