Saving data works now, and other small adjustments.