Fixes

Fix the URI stuff.
Also fix the way stuff.