Update Comments and Java Doc