improved token-extractor for start/script