fix some bugz