Switching beat script to work with -trums, also fixed some bugs.