Mod Highlighters

Issue #375. Also type check in weakness highlighter