fix some bugies