small alterations, made start on highlighting functionality