fixing api errors and change language codes

[ayya-vimala]

This is a whole load of fixes but not yet done. You can make remarks if you want or merge but there are still other changes coming.