More javadocs, address review comments.