changes from review + scaladoc improvements