More Updates to Prepare for Beta 1