Second pass at FeedEngine revisions