Fix bug and adjust configuration
Add options override mechanism, make command options the highest priority