r14634: Many bug fixes thanks to train rides and overnight stays in airports