Fixed some hand-made tags
Propably final touches