add more FIXME
distinguish between disc and track credit
Set proper track ids.  Fixes #34