Fix JS and add new samples