Additional JavaDoc and small fixes