highlighter upgrade, chat box resize fix
merge