refactoring.
Updating ChangeLog.
Updating help message.