Fix some incorrect highlighted characters

Fix some incorrect highlighted characters and words + some fixes