add uri helper & some fixes