added comment parsing