More content amends, fixing a few final problems