Some fixes and enhancements to instruments translation

Note that the change to the py file is entirely untested...