Adding URL support. Also, speed optimizations and bug fixes