Comments added, working on feeds and market