You are correct in both. I edited the post so it should read correctly. Sorry.
I will also put up the maps of the bus and our travels as we go along. Go to the first page of the IC.