Updated 'highlight' and 'unhighlight' to be less restrictive
Fixed bug with error class not removing properly