Updated to allow feed selection, minor fixes