bugfixes,comments, translations,javadoc