Rolled back a few final beta changes (this will really be the last beta release)