comment parsing fixes