Add 'repeat' bundle; fixing path; some cleaning.