Working on feeds and other various fixes