fix tag etc