Apply other changes and add missing JavaDoc