Fix: a minor parsing bug;
Add: more implementation for DaoMake.