A few javadocs has been added here and there.