Fix Frame bug
fix some bugs