+ Added double quotes in places where needed
Remove double quotes in ps args