Finally fixed git mistakes?