Fixed some buggs in the new language system