fixed bugs before release

fixed bugs before release