Where was Jim while Huck was at the Grangefords? How does Huck discover him?

Jim was hiding by the river repairing the raft for when they were able to take off again. Huck discovered Jim near the river after his servant tells him to go check out the mess of water moccasins (so his servant knew about Jim).