Fixed redundancy checks causing connection issues. Updated simulator sonar mapping/indexing