will now check if other error ocurred while restoring file.
moved stuff into the feed type.
some cleanup.