fix some wall collision bug
fix second collision bug