added comment capabilities