added highlighs, various other changes