Added border stations, other improvements