Move some text into it's rightful place
Tag fixes