Some fixes and support for more than 2 voices