Improved JavaDoc and template comments.