fix tags + minor addition