cleaned up and made everything work in git module