A few fixes to get saving working properly because the list is acting weird.