Improve feed discovery + tiny fixes