Reverted last changes. Trains stop at stations. Removed some troublesome asserts