mod for amd loading
refactored uri pieces, cleaned up names, added docs/tests