more changes, serializing and saving