add tag in header
various fixes