1. Moved bus trap further down to aid in navigation

    Closed
    #178348096 0 1 0 0

  2. Made bus lock location match its actual location

    Closed
    #178311406 1 2 0 0