fix all
fix some where