more changes and correct urls