cosmetic change in token regex
use full keywords
reorganize folding text