MAJOR: fixed many bug v1.1
fix