More Bug Fixes for Custom Language 2

Hello everyone,

I did some more fixes for the Custom Language feature.
Hopefully everything is working correctly now.

have fun! : )