Safety save - edit modalities

Now obeys preferences and working on saving - still some fields are not
right, working on it