fixed bugs in Beta-1