* removed bugs and add some command options