merged TrackController and TrainController Simulator changes