updated battle and halos
fuck git