fix bugs and add some more requirements for beta
fix bugs