Why this track? and bug fixes

Why this track and bug fixes