intrain changes - mostly minor