adjust options, fix completion