add new feature, initial fix of gds, improove internationalization,
clean code