*: fix tags so that they are safer and more sane
Merge branch 'blog'
[working commit]