improve demo & params