Bugfixes, add lang file support