giza: git integration and bug fixes