update demo options and small fix