fix and add more crwaler