polyphony!

Also a host of  bugfixes and little changes to existing code