fix tagging and add spec