Minor changes, implemented URI echo functionality