for high level review, not ready for merge. fixed a couple scaladoc refs