Refactor to fix headline feeds and various bits of code