more improvments to mdf parser