fix some bugies 2