fixed tags and other stuff