minor fixes + added highlight