merged language fixes from @annonn #43;
fixed some comments