Merge pre-tg-merge BEF

Nice chunk of updates. :D