Tag fix and partial

fingers crossed