Allow comments in the feeds file
Fix up some feeds