some javadoc added, internationalization