fixup regex and add class