parsing & highlighting improved