More vision revisions
Fixing merge conflict in objectclient and fixed territory