added comment parsing (doesn't work if comments is inlined)