some minor fixes and updates
minor udates and added target_uri opt