updated with fixed URLs and other cleanup