improve parsing, adding highlights to hot functions