Fixed the find- and save-functions. Updated the code to use the new representation of fields.