Simplified code in DAO, changes to Git Functions (#1174)

* Simplified code in DAO, changes to Git Functions

* fixed append i +1 issue