Fixed Song and Instrument parameter passing

Not very pretty, but it just werks