url.encode has been added
minor fixes