Added even more JavaDoc
And yet some more JavaDoc