[s]notes need hr taaaaags[/s]

I'll probably accept the CS in the afternoon with other updates!