Misc content changes + fixes