advanced badge save improved

and diamond masterpieces
badge upgrade fix, some small improvements