Fix some audit violations and

I fixed some of the basic audit violations and also added some javadoc comments (which also fixed some audit violations).