Boom Dojo: Beat matcher improvements

And bad ninja polishing