Updates to javadoc and comments.

Signed-off-by: Anders Hammar <anders@hammar.net>