added a TODO
corrects a bug in sampling same/diff spkrs
corrected a bug + added test for word + spkr