#82 More JavaDocing