tags, cat fixes from staging