* cleaning, add help-message to --help, optimization