updated url, tweaked names