Fix git commands; Debug; Clean-up