Improving models. Fixed some keys, added track #
and # of tracks