Add comment base functionality.
Improve headers and style.