added better comment parsing