better sonar?
more informative save messages