Minor data fixes
Integrate donelli parse functions.