Added comments, JavaDoc and minor improvements

Signed-off-by: Jan Hoppmann <Jan.Hoppmann@sivis.com>