fix some bugs--20140704