git fixes and stuff