-- fixed various url issues