Fixed highlighed and added set solver highlighting