added in toplevel, fixed changes relating to URI's.