add more samples and fix bug