Improve Highlighting and added many changes