add some little changes to URL parser, still not working.