added toupper/tolower support; started expanded highlighting support