Added bus only and train only options, fixes #7