added comment handling