clean up, URL fixes