Lwt import, trap errors
Review term highlight fix