sonar improvments