Add tweaks to the new system, based on the content provided and natural upgrades from the alpha build