Bugfix/gl lang

I merged two branches from @DaAria and fixed the lang file a bit so tests pass.