More TODO cleanup and Scaladocing.