Made a few changes to the Sonar mapping and added some rough comments