Made a few tag tweaks