Updated/Added feeds, refactored code