Added highlighting stuff and search and replace modification