minor changes in train, thoughts on pathfinding
Merge remote-tracking branch 'origin/master'
nothing important