Saved data format
Comments and small fixes