Fixed override mechanic, added retry saving