added gig retrieval and other fixes