more javadocing