Change config files.
Fix comments in java sources.
Update config files.