merged language fixes from @annonn