fix bugs, beta 1.0 version