Fixed 3 bugs Critical and some bugs major on sonar.