added more language tokens, beginning to implement language switching