Added more documentation
Fixed javadoc warnings