url changes

- Marc + Smit
Minor url changes (reflected from deployment)
Some fixes