refactoring and "fixing" feed fetching a little bit...