updated tokens and rules, organisation of langlex too