Fix some bug, ready for beta