massive update with lang support and more