some fixes
parsing DD + tests