Fix repeated commands + use escapeshellargs for escaping