Test javadoc. And some small modification for bugs