improvements to urls and code style