fixed all remaining issues
Fixed url issue