Updates to beta including more cohesive merging of alpha/beta