lot's of sonar violations fixed