Verified loading of defaults and preferences. Removed file building code.
Update from master.