Dont send track around in the playing system, plus various smaller changes