More support for drums and other stuff

Still some bugs to work out, I'm working on 'em!