added comment functionalities