new samples,a few bugfix