Updated unit locations and fixed convoy bug.