Renamed p_cmd to p_run, removed p_make