Fixes
Done with ya_news