Adding feed
Fixing issues