misc changes in track controller