add SAVE + fix small bug