Clean up formatting. Get saving working better.