Fixed highlightning and done some other code stuff