fixed highlighting needs cleaning up