Added Scaladoc and other comments