Added save
fixed stuff