fix some bugs by louis