internationalizatio of gds, minor fix, fix warnings, complete logic