fixed class tags and other bugs