Updated TODOs
Fixed bug where uristring was undefined