Added basic comment features.