add better highlightling and reorder
ycm improvements