updated language definitions
small server fix(fixes an error that might occur)
merged