some fix & taging