Updated urls, tweaked some strings