small changes, fixed matching samples