Changes in the feed builder and some reformatting