fixed errors
more annotations for html documentation
fixed errors