just tons of additions changes preparing for beta1