more train fixes