Get the instrument list partially working on OS X.
More general fixes and improvements.